vim: add actual xxd version

Use the actual xxd version instead of the vim one for packaging.

Add matching CI test.

Signed-off-by: George Sapkin <[email protected]>

diff --git a/utils/vim/Makefile b/utils/vim/Makefile
index 7726765178705ddf80bc516c0afdee9d1941cdff..60124b67a5076e61a31948a869e5b498dd52dc7d 100644 (file)
--- a/utils/vim/Makefile
+++ b/utils/vim/Makefile
@@ -9,7 +9,8 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vim
 PKG_VERSION:=9.1
-PKG_RELEASE:=1
+PKG_XXD_VERSION:=2023.10.25
+PKG_RELEASE:=2
 VIMVER:=91
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -71,6 +72,7 @@ define Package/xxd
   CATEGORY:=Utilities
   TITLE:=make a hexdump or do the reverse
   URL:=http://www.vim.org/
+  VERSION:=$(PKG_XXD_VERSION)
 endef
 
 define Package/vim-full/conffiles

diff --git a/utils/vim/test.sh b/utils/vim/test.sh
index 913b9c6b1f993efa5b6ccf21b0a893caabce49d2..0ef5041041f53a1308a353e2d3eae4fd84a97bd3 100644 (file)
--- a/utils/vim/test.sh
+++ b/utils/vim/test.sh
@@ -2,6 +2,9 @@
 
 case "$1" in
        vim|vim-full|vim-fuller)
-               vim --version | grep "$2"
+               vim --version | grep -F "$2"
+               ;;
+       xxd)
+               xxd --version 2>&1 | grep -F "${2//./-}"
                ;;
 esac